bitkeeper revision 1.1159.76.1 (41476ba5rg4qFnlhUY3tth7mouxVQA)

Use a better dummy rootdev in Linux 2.6, so we don't auto-dhcp
when we shouldn't (David Becker).

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c
index 22f1dab651a2287a57427a0ea2e65dbe7ad52979..b225c26fad5eb1afb469f08e32e8280fd7958f96 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1313,7 +1313,7 @@ void __init setup_arch(char **cmdline_p)
                efi_enabled = 1;
 #endif
 
-       ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+       ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); /*old_decode_dev(ORIG_ROOT_DEV);*/
        drive_info = DRIVE_INFO;
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;